Some code formatting improvements.

Signed-off-by: Nigel <Nigel@10.203.2.25>
Change elseifs to or

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