Cleaned up the network controller a bit.
Merged from master.
A little more cleanup
Merge pull request #37 from LocalStory/ChangeLabel

NetCon Cleanup