minor cleanups
more cleanups
echo cleanup