Some quick cleanup