Fixed comments, spacing.