some cleanups
cosmetics