Syntax and Formating

Some syntax and formatting updates. No logic changes