Codestyle, removed some warnings ...