Just a little clean-up...