cosmetic changes + comment out passphrase in hopes it will be asked