more cleanup and migration to classes

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>