remove useless comment as suggested by @mchf
refactor touched code as @mchf suggest