fix, code cleaning