commented and pretty-fied