cleaned up under hood

ok I think I got it.