some small
some code cleanup