updated parser to remove spaces