Minor refactoring, removed a bunch of unless's