minor changes
code cleanup