Some more codestyle