some small changes
code cleanup