Cleaning some things up..