Address some code standards issue in the embargo module.