Refactor & Cleanup