Clean up animation a tiny bit
Some minor tweaks