Cleaning up minor style issues