Added Mozilla Review suggestions