more clean up of syntax