Refactored for Express 3.x

Signed-off-by: Zander Bolgar <lezed1@gmail.com>