Things were cleaned up, vaguely