Cleaned up code, ready for demo

Cleaned up the code by removing all commented out code and any TODO that
were completed. Also commented the code better to explain what each
component was for. Re ran the benchmarks and they all passed.