Change PS1
Refactor for consistency