Started a clean-up process by trying to separate look-up values from code