Better naming
Avoid duplication