refactoring

removed duplicates