Steph Refactoring