Include blank lines in count
Cleanup whitespace