Minor cosmetic changes
Merge branch 'refs/heads/Cosmetic' into dev