Refactor/Simplify