Removed copy/paste issues