Changed all instances of clone to constructor