Style fixes to the source code