Simplify, refactor