Minor cleanup/refactor