Refactor: Split and simplify