Removed Cruft and commented more