Cleaned up line breaks and comments - first pass