quick refactor for new site