refactoring for simplification
refactored for simplicity