Code style adjustments