added directive to pretty-print final output
some changes
clean up