Refactored to remove need for 'clicked' class.