Minor modification - Clean up