Cleaned up commenting a bit, ran basic Mininet tests with not problem.
I'll be submitting now