MAINT: Some code cleanup in the blotter module