refactoring; mostly comment removal