code clean 2