some fixes of codestyle