cleaning up a bit before larger changes...