spacing and comment cleanup