refactoring

comments fixed