Cleaned up the program

- Removed old functions that I'm not using/am phasing out
- Removed old testing comments that are no longer necessary in those
locations
- clarified just a few points in the code