...
some code cleanup