Fix cast exception
Cleanup