Cleaning up naming
Cleaning up in macros
Adding shorthands, removing (...)_WITH_DESC macros and making description format string optional