updates/refactors

Signed-off-by: Kevin Huntly <kmhuntly@gmail.com>