everything is working, now cleaning up