Clean up a little.
v1.0.0-prerelease.3 Express 4 compatibility and refactoring.