a bit of clean up here and there