Some quick cleanup.