[IMP] Clean code and animated copy