Cleanup decoder methods with helpers