[BUILD,NOP] some final cleanups of comments and macro names