Refactoring Safely

Refactor with tests first, one change at a time, never mix refactoring with bug fixes or new features