misc: Done some tidying