Coding style and tweaks