Refactor & Simplification