Improve getpass script