comment syntax cosmetic changes.
renamed some macros for better readbility.