code clean done