Sprinkle some unsets to reduce footprint and correct some whitespaces