Simplify parsing, and look for a password