More cleanup
Additiona cleanup
Merge branch 'whitespace'