Add missing requires
Cleanup
Use a guard clause