Tidy up, reduces ->run conditions