Better naming and things.