Minor cleanup
Minors