small fixes

code clean