Some minor cleaning up [ci skip].
Some minor cleaning up [ci skip].