refactoring
refactoring + help