Removing double use of code..

Removing double use of code..