Did some much needed code clean up
Fixed version for iPhone 4S and Eli