Refactored code to take advantage of Clickable parent class.