Cleanup & Refactoring