Minor refactoring

I want to to go bed.