Added additional comments and removed junk