Refactor & Cleanup - 5