cleaning some bits up