[CLEAN] Refactor notice partial