Tidied up provision structure