Improvements
Removed some NSLog() calls