Use NSUInteger everywhere
Remove import of unneeded assert.h
Minor changes