Code cleanup per Xcode analyzer