Some quick reorganization
Stupid bankruptcy bug I thought I fixed days ago