Cleaned up comments and removed cruft