Tidy up of open logic