Some minor cleanup
Merge branch 'origin/master'