Making Text.animate more generic, minor clean ups