got rid of the magic strings from the code