Upgrade to express 4 + refactoring