Blaze refactor