Updated to express 4
Refactored code