[Matahari] [PATCH] Updated coding guidelines