Refactoring ps views