commeted and some cleaning up