Issues 11 and 12, cleanup.