Cleanups suggested by AppCode