moving animation + refactoring
stuff