Postpone new polar coordinate and general cleanup.