Cleaning up the Server Side of the system

Formatting and Whitespace fixing.