refactoring

small changes in all