Rubocup cleanup