trying to pretify it :D

commenting some stuff, cleaning up other stuff. It's still not
beautiful, but expect more of these commits