Cleaned up some stuff for posterity.