Just some general cleaning up of both code and presentation.