major cleanup and revamp

Signed-off-by: Mark Nelson <mark.nelson@inktank.com>