Reduce number of rubocop calls, fixed problems from merge request.