Parser.php - cleanup and comments