`mcro` cleaned, a little bit fixed and moved to `macros`