Quick refactor-ish org pass