- Replaced ELIF statements with dictionary
- Now uses separate input functions that generates a dictionary 
depending on the data file