(Apple) Style nits and cleanups