Cleans up the callbacks a little