Clean code to follow rubocop style guide