Some quick clean ups