minor refinments [ci skip]