Refactoring (is apparently good for your health)