a few improvement proposal