refactoring

Signed-off-by: Tom Everett <tome@criticalmass.com>