Slight logic cleanup; bump