syntax clean up