Docs
Cleaned util/macros