Coding style and indentation tweaks