Code refactoring was done.