Don't clean up if building in-place
PEP8 and bad practices
Fixed display of domain control inheritance
Some more code simplification, PEP8