Addressed some recommended changes.