Dev

Cleanups after first look at mininet repo.
First two commits are cosmetic changes.