Some cleaning up and whatnot.