Cleanup and finished implementing callbacks