Code coverage added
Code refactored