cleaning up 2