Added explicit require
Simplified code