cleaning up more