Refactor to use express 4