Better naming and comments