Some minor cleaning up [ci skip].