remove debug ouput & use macro to fetch boolean values