Code style changes from Ventero feedback.