1.6.2
code cleaning