Server Code Cleanup

Convention Fix and Rearrangments