minor refactoring, deleted some comments that were not unnecessary