Removed cruft, added comments