Cleanup & Refactor