remove some spaces for tabs
fix issues with variadic macros and logging