Update code conventions

Added some more about spacing and variable declarations.