Cleaning up some potential memory leaks
More code cleanup per Xcode analyzer