Refactor a little after rebasing the subclassed server onto this version