Removed logging
Big redesign: less macros, more CLOS
Cosmetic changes