Moved the performance logging to its own defined macro
Reorganized the private members and methods