More ps cleanup, mostly refactoring.
1 file changed