Code clean up.

Signed-off-by: ekennedy <evkennedy@upei.ca>