Basic code clean-up only. Sending through XCode