light refactoring, cleanup
Animations without flickering, always same speed