Refactor / Simplify