cleanup syntax issues