Simpler code

Signed-off-by: Craig Sullivan <craig@melbourne-systems.com>