Changed some formatting to make it look better
Merge branch 'refs/heads/localDev'