Cleaned up code and making all calls to the IClickable events