Minor cleanup
v1.2.0