Fix type and minor spacing adjustments.