Cleanup #1

Improve use of Objective-C and Cocoa style, naming, and conventions.