minor fixes + clean-up [ci skip]