Some codestyle improvements