Parsing everything
Minor aesthetic change