And fix rubocop issues
mentioned in commit e87d1faf
mentioned in commit 3bce060c
mentioned in commit 1994259b