Cleaned up old Objective C implementation of animation framework and brought inline with the new Swift implementation.

Also cleaned up some of the Swift implementation.