Yeah, agree. I've pushed some changes considering your suggestions.

It is far more better and cclean.wondering if you can take a look and see if you feel the same.

Thanks.