cleanup, restructure
prettyprint