code cleaning over