First iteration (including whitespace)

Signed-off-by: Daniel Tarrant <daniel.g.tarrant@gmail.com>
Second iteration

Signed-off-by: Daniel Tarrant <daniel.g.tarrant@gmail.com>