Minor fixes.

This standardises the whitespace to two spaces and cleans up the code.