organizing, stablizing the api, etc. looks reasonable