Fix issues with formatting

Fixing discrepancies between master and development that create merge conflicts when merging back.