[CLEANUP] fine tuning steps