Restructured white space
Merge branch 'cv' into public