Refactor express app