cleaned up under hood

Looks very nice! Good work!