Main cleaned up,