Refactoring

minor changes