Minor refactor. Seemed to make sense