Cleaned up some callbacks