Further style optimisation
Use animated gif instead
Refactor