Changed codestyle