Cleaned up PS1/PS2 variables