more express refactoring