Refactor & Cleanup - 4