Some quick clean-up