Tidied up serverjs