General cleanup (mostly comments)