Code

Merge branch 'jc/apply-whitespace'