extra files gone, added comments