Reformat code. Cleanup in server singleton.