Thursday Refactor