Minor edits
Added macros as the middle characters