Since I modified most of the file I took the liberty of removing these white spaces in the comments. I remember  @troessner telling me you prefer people not to touch the white space in a file if there isn't a reason to do so, but I'm already going over the whole file. 

My .vimrc highlights end of line white spaces as bright pink which makes them a sore sight for me.