clean up, fix syntax