Cleaned up after my changes.