cleaned up the clone logic