#842 refactor the code base to use modern objective-c syntax