more clean up of syntax and layout