Better naming and internal organization