smoother animations, delete duplicated code, little cleanup
add correct name