cleanup syntax