Spacing, comments, and general enhancements