Code refactoring after Rubocop 0.8.0 checks
Additional code refactoring after Rubocop 0.8.0 code checks