Thank you @shaktik for review. I have refactored and pushed the changes to 8....