Some more code cleanup and replaced NSLog with Print, which is swapped out on a release build. More changes to come