Fix comprehensibility code