Even some more codestyle