Fix up to meet style guidelines