Some cleanup and add a server properties parser