Replace Logger
Macro replaced
Change Logger to something more c++