Fix code formatting issues, remove NSLog, #5