Tidy some comments
Extend loader