Minor refactor from yesterday