Code cleanup
Fixed some copies