minor changes:refactoring