Minor: improve design