cosmetical cleanups