More conformance to rubocop requirements.