Reduced redundancy in the ButtonHandler
Merge pull request #1 from Void-Director/DRYer

Reduced redundancy in the ButtonHandler