2.3 code clean