Fixed whitespace being forced after every token