'S' in SOLID: improvements