Updating for newer Express and clean up

Also passes JSHint