Refactor

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>