small cleanups and a beautiful new whitespace in output... ;)