[REF] Clean templates formatting so they are legible and maintainable again: white spaces at end of line removals