format and clean up
Close #198 Encrypt the password with a master password