minor cleanup/refactor