Extend whitespaces and add quote