Unit and Puck style refactoring