improvement for reducing warnings