- some code cleanup