Coding style updates and comments cleanup