~ cleanup logging macros to own file
- more cleanup