Added comments. Removed cruft