Better naming and formatting