Updated coding guidelines