Introduce end-of-line normalization
Fix style