Tidy up [ci skip]