Cleaning some bits up