Tidied up server