Codestyle improved