Cleaning up copy pasta