draft
Fixed codestyle