fixed codestyle 2
fixed codestyle 3
fixed codestyle 4