few more code style adjustments