Added description, cleanup.