Fix debug output slightly
Simplified subnet blobbing a bit
Cleanup and beginning of a refactor