Clean up. Added icon.