Refactoring, Yosemite, Xcode 6, etc.
More improvements