Specified missing PF repository
Comments, refactoring, code clean-up