Final tidies for 8.36