remove white spaces
move macro to cpp file