Mostly spacing and comment cleanup