changed/unify code style