Simplify the parsing procedure