converted to modern objective-c syntax
reran migration after rebase and fixed warnings
Merge pull request #2055 from Kurry/feature/convert-to-modern-objective-c

converted to modern objective-c syntax