Feature/rubocop refactoring