Cleaning some small bits up