syntax
more clean up