cleaning up and tweaking