Improved codestyle