Objective-C refactor

Refactor Objective-C file for better organization, better descriptions, and fix parts of file blocking compilation.