minor changes: refactoring