Refactor & Cleanup - 1