cleanups msd
cosmetics