Remove debug statement
Add comments
This is class method now
Fix specs for following requires