Clean up + New PS1 prompt