clean up
Merge pull request #29 from MSOpenTech/near-expiry-password

clean up as per afshin's comments