Fix spacing and bom to align with existing code.