Code Cleanup

iOS 8 support