Cleared cruft, added comments.