Use subject and let more effectively
Whitespace and more subject/let cleanup