removing unnecessary stuff + fixing transition length