Fix  whitespace
Merge branch 'fixes/whitespace'