Switched parse_line so that it doesn't return the end