Fix falling crash
Cleanups