refactor

Signed-off-by: Kevin Gaddy <kevin.gaddy@gmail.com>