[mr3115] Some codestyle