cleaned up servre.js a little bit more