[CLEANUP] boolean -> bool, integer -> int