code cleaning #1