Minor refactor, since I'm keeping this around