Removing all the hardcoding