Migrate to express 4.0
Reduce indentations