Style and whitespace fixes
Resolve rubocop errors