Simplified, clarified and cleaned up PS1