Remove unneeded comments
use acronym macro