Minor Revision

Cleaned up click handlers