added prettify, changed markup a bit