Minor cleanup/refactor (ns stuff)