streamline rubocop, fix issue which comes with this change