code cleanups...