rubocop: few changes for issues raised by rubocop