[Design] minor changes