More quick cleanup. Nothing fancy.