Added copy method to object and did some minor clean up