Tidied yp the Objective-C code