More rubucop fixes! :+1: