Some quick cleaning up