ctd gasoline refactoring