Optimized chunk loader

Fixes #1486 
Brace on next line