Cleaning repetitive code
Merge pull request #224 from akshayah3/develop

Cleaning repetitive code