Refactor code #5935
Merge pull request #24 from priyankarani/task-5935e

Refactor code #5935