Random Refactoring - Take Two