Actual final cleanup

Removed duplicated method
int -> NSInteger (64 bit warnings and such)