Added comments and removed junk code!