[Matahari] More coding guidelines