New copy and code cleanup