Fixed: Cleanup + refactoring