Update comments/spacing, and remove duplicate