Cleaned up toad parsing