Better description for strstr.
Test the return value more closely
Remove dead code and extra newlines