lots more cleaning up