0.1.1.6 code cleaning