syntax and styling fixes