refactor maudsley