Fixing minor style issues with last commit