spacing and minor cleanup