Cleaner Blaze code