- Code cleanup

Signed-off-by: John Grange <john@sd-networks.net>