A few missed refactor areas