Bit of refactoring for future server updates