Minor Fixes

[mee4895]

This patch fixes a few small things which annoyed me:

• Remove trailing whitespace from all files
• Change the indentation style to be four spaces everywhere (since it was the most prevalent one)
• Remove a unneeded variable

[juliettef]

Thanks we'll take a look

[juliettef]

Thank you for pointing out those formatting issues. They will be fixed as part of future changes.