update some comments and fix formatting