made some comments and minor cleaning