Changing coding style

EV-531