refactor^3

Signed-off-by: Barry Allard <barry.allard@gmail.com>