More codestyle