Some code cleanup(this fixes some annoying syntax highlighting error in notepad++)
More fixes to prevent rogue servers being spawned