PS4E1 Code Reduction

Flow optimization.