some code style adjustments