clean up express a bit more