Attempted tidying