cleaned up under hood