Clean parsing/deparsing