Condense logic slightly