Starting to clean up copy pasta