Thursday review and refactor