Changes made based on Bryan's suggestions.