Doing some cleanup according rubocop