int -> NSInteger fix, removed comments