Coding style fixes as requested