23.10.14 - code cleaning