Simplification Refactor