Addressed PeP8 call outs