Quick fix
Cleanups