Very minor code cleanup
Merge branch 'v1' into v2