Bit of tidying up and also changed a few more instances of Octopi to BPF