removed some noise comments; small refactoring