Cleaning up callbacks into class