cosmetics and minor cleanups
cleanup
cosmetics