Coding standards and tweaks