Bug after refactoring
Cleanup