Addressing the lint issues on Epg.