Minor formatting and code changes.

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