small fixes

code cleaning