Code clean up and refactoring accoring to coding conventions
Code clean up and refactoring accoring to coding conventions

volodymyrss/3ML,sybenzvi/3ML,giacomov/3ML,sybenzvi/3ML,volodymyrss/3ML,sybenzvi/3ML,giacomov/3ML