Updated to meet style checks.