Improved Codestyle / Code formatting

Improved Codestyle / Code formatting