friday afternoon refactor