Improvements on spacing and language