Following changes were made:
    1. Fixed pfs deployment scenario.
    2. Minor idiomatic changes.