improved codestyle