Minor refactoring
Separated macros and markup