VOYEUR: Refactoring Bolt statics into a separate class