Last clean up of the code before Tuesday labs.