fix codestyle
Improve code quality