Minor style updates, refactored collection reloader