code cleaning #21