Make animation mixin cleaner

Change-Id: I5103daf43112d5a412c030dd90fda67a08469885