pre-work-site refactor