Tidy up PrismaPlusController, buffer reader & mediator