Cleanup syntax