Spacing and syntax cleanup