update spacing and minor cleanup