General tidying in Frames.