Parsing free of bugs, hopefully
More readable parsing code