NetCon Cleanup

Cleaned up the network controllera bit. I'd like to refactor some things over the week but at least it's more legible.