Style fixes and comments