Code refactoring
Performed renaming
Code refactoring