Fix coding style
Merge remote-tracking branch 'chris/space'