prettify code, version 1.1 - final