Updated code to use new literals "[NSNumber numberWithInt] to @()"
More memory issue fixes