Clean up; remove duplication.