Cleaned up Pheobe's changes.