Codestyle, closes #3600