Small cleanup.
wip
some more clean up.