Minor changes.  Fix hlint suggestions.