updated server to use express; cleaned up