cleaning up and my comments