Tidy: Whitespace and comments

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