Some quick cleanup...