cleaning up more and more