[3.4] Codestyle