Style Changes

Fixed most of the style issues that rubocop pointed out.