fixed a refactoring error and a few comments