Fixing a few style issues brought up by @bkerley