Last commit, just a some code cleaning and also took the time to check for memory leaks with Xcode Instruments