...
...
...
general code cleanup.