MOAR HOUSEKEEPING

Cleaned up some names
I call them carvers now instead of callbacks