Cleaned up style with rubocop