moved routines, cleaning