Tidied some spaces
Merge branch 'dev' into ms