whc code cleanup
next changes to use bool type