Convert to modern notations
Use NSInteger instead of int