Joyb22

Yes your suggested suggestions are accepted.

I am approving it & merging it to actual code