1. Performed Code Cleanup
2. Switch to using a regex to extract information from file names