Style fixes and remove a comment