refactoring
refactoring
refactoring and simplification
bugfix + refactoring