Changed to common codestyle
Compliance to coding rules