Clean up the conditional in preperation