cleaning up (some more)