Changed to common codestyle