Some codestyle modifications