refactoring
better condition