Made adjustments via Dan's suggestions.