refactor express