minor commit
finished refactoring code
animaton
minor animaton