Minor code changes, formatting, etc.

Signed-off-by: Nigel <Nigel@172.23.132.28>