Client Clean-up
Edited imports to only import the stuff we need.
Cleaned up almost duplicated methods and merged them to use up less
space.
Formatting

Server Clean-up
Files should always end with a empty line
Formatting