Fix code formatting to dev team's standard