More refactoring
- Slightly more accurate/verbose output
- More sensible variable names
- Fixed attempting to run files that don't exist