[issue-23] More rubocop fixes