Add some DRY
Add more DRY