slight refactoring

Signed-off-by: Sam Heuck <sam@astonishdesigns.com>