Address some Ruby style issues