Further minor cleanup