changes according to codestyle