Changes made based on feedback from Emmanouil.

@saeedhaghtalab I have some changes to the Gamma Blocker OPI based on suggestions given by Emmanouil after MPS testing was complete. Can you please approve the merge request after review?