Bug fix
Cleanup