Update on Code Conventions