Tidying ResultAdapter.php and Result.php