Cleaning some stuff up, a little.