all code blocks are now prettyprinted
refactorings