some code cleanup ...
some more code cleanup ...