cleaning up a few areas