Better cleanup & prepare