cleanup whitespace
move that up there
Merge branch 'extend'