[WIP] Tons of cleanups

I'm making a WIP PR here for all the work I'm hoping to have this week. Stay tuned.