More code refactoring to improve readability

EV-196