Responding to comments from pull request 24. Cleaned up a comment and a warning.
Further changes to warning.