way to go 2x
simplification
refactoring
refactoring
cleanup