Little improvements to coding style