Tidying: Whitespace and comment removal

Signed-off-by: Tanya Gray <tanyagray.nz@gmail.com>