cleaner parser - use some python