fix no-animation as well as formatting