More tidy ups