little cleanup of the setup of commitment-issues