Spacing and comment updates