Fix trailing and erroneous spaces