Clean code, add macro stante-after
Clean code and made it robust