codestyle improvements