started code cleaning