added helper and cleaned notice