Refactored. Items 1-4 of Effective Objective-C book