Cleaned up PS1 commands