Minor cleaning up [ci skip].