More compact code using macros
1 file changed