litle cleanups