Removed spurious ';'

There were a couple spurious ';' characters at the end of
a macro definition; this leads to extra commands with no purpose
or action. Removed them.
Code cleanup and defines added

Added new defines to clarify code. Removed extra spaces.
Increased commenting and fixed spelling.