Cleaned up server properties handling code