cleanup
Simplified parse
new version, simplified parse