Various Improvements/Cleanup

- Less networking
- Less useless globals
Various Improvements/Cleanup (Again)
Revert to original coding style

Spaces Everywhere :V
Missed one
Merge pull request #1 from zerfgog/master

Various Improvements/Cleanup