Removed some spaces.
Merge branch 'CleanUpCommentsFix' into dev