Did some refactoring and animating