Begin refactoring using express