Small codestyle improvements.