Uniform codestyle

Uniform codestyle
C&P reduced

C&P reduced