Cleanup and added GDB macros