cleaning up... still a lot of work to do