Code style changes - 3