Modify some code style
Convert to modern Objective-C syntax
Merge branch 'dev'