Styling improvements comments

All the commits, all the styling fixes.