Code clean up
Fix derp