Strip trailing spaces
Style
Treat words in quotes as a single word
Update TODO
Update README