cleanup debugger code
fix incorrect order of logical sub-expressions by checking of toggle more transparent way