Spacing, remove redundant comments