Altered:
- Cleaned up all the code that I changed so that it is consistent and
easy to read.
- Removed all the timing code.
- Made sure to put back any pieces I commented out to help with testing.