Spacing, old comments, other adjustments

Broad cleanup of code style, focus mostly on stale code.