small fixes
code cleanup