Refactor & Cleanup - 2