Fixing up some simple style issues