Minor refactor

Nothing special here, just a little cleaning up.