workout refactoring
workout refactoring