A stab at cleaning everything up.