Some misc cleanup + UX