More code clean up.

Have to make it work and look good for the final presentation of the code during the class