Making class structure more (or less) correct