Refactored a piece of code within a function which is going

Refactored a piece of code within a function which is going #275